cleaning up
using new project structure
updating project architecture