Reorganize file layout, fix image at top of contents