more project structure changes
improving structure