Moved classes to the classes dir