cleaned up config settings to my preferred folder structure;