Additional changes to directory structure and modal / back button bug fix