Renamed and moved some files.