updated namespaces
renamed Helper -> Generator