Changed to my standard project structure.