Reordering directory structure for #35.