restructuring configure files & created helper class