Moved file to valid package name.
Change path name in files to new package location.
Fixed wrong type.
Fixed package name.
Merge pull request #2 from Danack/master

Fixing small compile problems