Moved around files to clarify their purpose