v0.4, restructure