Moved functionality to RectModel
fixed errors in branch
deleted two unnecessary files