Finished updating folder structure

In preparation for publishing on npmjs