* move mocks to the owner packages * squash single file packages * move types to more appropriate files * remove unused mocks