cleanup directory structure
cleanup directory structure