Refactored some common functionality into common library
Removed unnecessary projects and refactored