Restructured main branch