Cleaning up some includes and splitting soem classes into their own files