Some clean up and movements to new header files