v0.0.6 reworked structure