directory controller/view setup, ready for additional functions to render file animations
Uncomment popup.js
Solve merge conflicts with folder-structure
Merge branch 'folder-structure'
Conflicts on index has been resolved