Refractored source to source-1.0, prepaired for 2.0