Moved some files to weave.primitives package in WeaveCore project.