rename two classes, refactoring, have added the onsiteusers parser + test