Added projects and refactored code