Reorganise directory structure to be more like Maven projects