Structuring

Moving classes around and debugged the config handling a bit