Reverted the current config setup
Added config class and simplified stuff