Massive internal restructuring - part 2