Resolve folder name conflicts in View
correct package names
Merge pull request #2 from rchavik/pr-4

PR 4 from original repo