more refactoring
renamed classes to make more sense
started on new localization