new project structure
merge conflicts, project structure in place