Refactored package name of all source files, but not the tests