review and reorganize configure scripts