Initial commit, redoing project structure