Moved and renamed various files.