Redesign source tree. Some improvements