First step refactoring, policies, loggers, locale