#2 restructure project. Manual text for commit, as git is refusing to commit