Some refactorings and an updated of the project documentation