Very nominal changes in the master-project to refactor it in simple way