Sourced redesign

by Pavel Karpov