Rebased folder architecture