Total rethink of project structure