Restructuring - Fiddling around with unique pointers