Fix .h files
MOVE EVERYTHING