Removed unnecessary projects
Code refactoring