removed all old classes, refactored new ones into api and the rest