Conversion to better OO programming
First commit
FIrst commit
added files