Do cleanup, organize to maven specs