fixed dir layout
Merge branch 'master' of https://github.com/Veltas/hir2.0