v0.0.7 //2 reworked structure