Initial restructure of branch 0.3.0