Add layout, 2 step view
Add modulePackage to load all config from modules