Reorder components to be consistent
Change interrupt operation to be consistent in the future