improve directory structure