Refactoring package names, added maven repository