Wrapping my head around smart pointers. Restructure some include files.