Moved classes to an inc directory