Restructure source tree