New layout, basic structure for the upcoming OS work