Realthargor/pom cleanup

renamed some of the modules so they reassemble the current hierarchy