more repository structure and build changes