Restructured to bari layout #1
Restructured to bari layout #2
Now compiles with bari
Fix of issue #30