Modify directory structure again