Refactor file locations and fix localization issues,