Reorganize; Build v0.1.2