Moved objects to framework dir