Cleanup and change the directory structure