Bugfix and empty dirs to make the code buildable