Added EJ's new headers, fixed directory issues