Project structure changes for future maven release