Refractoring
Organize visual studio solution
Measurement enhancement + Test