A full restructure
Merge pull request #151 from harshavardhana/pr_out_a_full_restructure

A full restructure