orange nav bar
cleanup
refactoring file structure