Refactoring packge naming to more generic.