Moved classes over from UDB3 project