Massive refactoring of object classes and loaders, moved constant strings from resources to resource bundle
Fixed merge conflicts