Made project more OO