Restructure folder hierarchy