Refactoring packages to be org.metova