cpp & h separations

[LucioPiccioni]

src cpp & h files are not completely separated into files. (They told me to add this).