Cleaning up directories to fix git problems...