merge all layout directories, fixes #2