Add support for project/locale/list + refactoring