[MR] Api moves

Address #58