Partial redesign

Redesign to version 0.2.0