Added projects and refactored code
Added delegates