Some refactoring ofthr project
some changes
Last commit
Last commit in this version