reorganised sources + began hardcoding non-user-parser
offuscation