add solution project and jumble the code in the original project