re-structured configure files