Refactor Solutions and add Programming Toolkit