Removed helper ref
Fixed broken imports and missing classes...