Fixed up the project structure, I think I'm happy with it now