Move object out to own file