reorganized some things for maven