Moving borders to proper object model