Move to proper directory structure.