Nicer generated directory structure
Align po files after refactoring