restructured, includescript fixed, testsuite is work in progress