Remove unneeded files and rename those with ambiguous names.
Rename code usages and add references to any unused files.
Remove unused dependencies.
Merge pull request #8 from kolinkrewinkel/file-cleanup

File cleanup and another retina fix