Moved classes to class library