fixed includes
moved methods out of unnecessary classes