Applied new directory structure, added Combobox