Some stuff renamed and removed non-necessary code.
Merge pull request #2 from ivarsst/master

Some stuff renamed and removed non-necessary code.