Moving a few files for path clarity

General cleanup for compile optimization
Fewer includes