Api moves

Address #58