Renamed and moved files into folders.