added structure for editor
merged files