Big file organization in meaninful folders.

This involved updating several includes and CMakeList