fixing includes to reflect new file organization