Added translations;
Refactored move of badly placed enums.