Migrate layout to core module