reorganize imports & defines