Seperate include files into 'include' directory

-update code to respond correctly to this change