Moved some files to normalize directory structure.