fixed all the data interfaces after reorganization of repo