V0.2 package-muutokset

Some classes moved to different package