* [refactoring] renamed package names to match standard use