Code re-orginized, is split onto the few classes