reorganized directories