renamed MainClass
config refactoring