various project structure changes