refactoring of the package name, new package is org.moskito.