Collection 'delete' included, automatic template generation folder structure improved