Changed file structure to reflect current contents