Move layouts from modules to global space