Refactorin of main classes. Added some streak files for for futurre implementation.