Restructure folder aids