Moved files around to simplify
Include more things in manifest

Not exactly sure if this is needed.
Fixed debug message
Merge pull request #3 from maguro/master

Update