Structural rebuild, added template file, 0.2.1

Updated to 0.2.1 from 0.1.1