Clean up repository structure