Final refactoring
Final refactor to all the projects