re-structured system folder