added folders
commented out some unused code
Merge branch 'clean-up'