v0.0.5 reworked structure