Begin change of project structre and fix more tabs.