Added framework as a separate solution