Refactor packages, better localization, migration to singletons.