refactoring of package names for consistency
Removed accidentally committed debug code
Fixes #2422
had to rename the packages to make them compliant with buckminster