Original sources with folder re-arrangement