Initial commit, sorting out project structure