fix layout.directories
various