Some comments corrected, some files moved.
Basepath logic changed (easier this way...).