Reorganize code between objects