CHANGE: some renamings of classes
CHANGE: put native methods in new class
NEW: further task markers in the code