Mass cleanup of unnecessary files

Closes issue #2
Merge branch 'issue-2-shortcut'