renamed a few classes
config refactoring work
shit