started refactoring
removed api file
continue refactoring