Revert "Changed file structure to reflect current contents"

This reverts commit 0168f2b252fdaca67a68383958a6410e28025b59.