cleaning mappings and submodules
adding buffet to the submodules
Merge branch 'develop'