reorganized source tree