Move includes into separate directory
Use correct inclusion path