Moved callbacks class to separate file, updated push functionality