Change config files to config folder + Design fixes
Change config files to config folder + Design fixes