fix the project layout
Merge branch 'dev' of https://github.com/fprieur/royalvic-fak into dev