reworked structure v0.4
reworked structure v0.4