Update implementation of single-module layout