restructure version 0.4