Adopted to new package structure and namespacing.