Reorganized directories and more responsiveness