Improvements to the directory structure