V0.4

Merging structure changes