git arrangement
Elements from backup of eclipse project.
Minor changes plus change of import.
Branch cleaning.
File name refactor.
Class name refactor.
fix
merge branch-cma