Reorganize into standard directory structure.