Rebased devel part restructuration