Reorganises project structure