Update to 1.2.1

Updating to the new file structure.