Bugfix and empty dirs to make the code buildable
Merge pull request #1 from marado/master

Bugfix and empty dirs to make the code buildable