Restructured folders hierarchy