change project structure, prepare for separation into subspecs