cleaned up mangled directory structure