Packaging fixes, indentation, moved assembly:single to package phase in maven.