Moved config files to conf/ directory, we were getting too many config files!