Added Folder and reorganized hierarchy for DesignView