arrange imports to be more like tutorial