Made everything use header files