Renamed directories, updated config files with new names