Moved internal file to main dir, projects couldn't find it.
Merge remote-tracking branch 'upstream/master'
Merge pull request #4 from ijansch/master

Fix errors with missing header file