Net4.5 and Refactor project

Net4.5 and Refactor project a bit