Major re-write to remove 'confusing' module system. Map and searchtree removed for further testing...