Restructured into modular layout