Restructured master code organization