Refractored some config and settings files