Resolved some including issues. All files are now included from an absolute path.