reorder import/export

@ussuri also had to rename a component import. Not sure how I picked up the wrong one.