New dire ctructure. Rearanged code in classes. Foruther recoding needed for OO python.