- Added common default directories for demo purposes
- Rearranged directory names for demo purposes
- name changes