Forgot to refactor the header, Also removed extensions from includes