Reordered structure v0.0.1