reoranized src tree