Beginning to move config files to config/ folder