Added dropdowns. Some project structure refactoring.