Finished Maven configuration, reorganised repo