Restructure, including 1.3 (sprint 1, update 0.3)