reworked structure v0.4