Refactored codebase
Saved
Fixed migrating of translations