Converting to cleaner maven project