move files to proper package
fix pom file (scala builer)