updated files to new structure & API calls to new names