Update #includes to accomodate module file dir