Merging Vasil Vasilev module and layout