fixed use of deprecated layout directory structure