Upgrading from rust 0.10 to rust nightly
Removing old structure, fixing main.