Continuing work on the multi module layout