Restructure the repository to ease development and testing