Messy refactor of project layout