Improved directory-layout