Rearrange classes a bit
Create first tests