Improved create a directory layout