Develop

Some cleaning/Refactoring/renamming suggested by Sonar

First step of integration with NEI using GIT submodules