Renamed classes
Changed package and more...
10 August