Clean up directory structure
Deal with fallout from cleanup