New project structure for better assembly.