Added main project and made changes