setup includes folder

adjusted other files accordingly