Merging Nikolai Baldjiev module and layout