Improve directory structure