Divided classes to headers
Fixed eq/main.cpp conflict