code organized in directory structure
Merge branch 'code-cleaning' into dev
Merge branch 'dev'