refactoring few more projects.