github doesn't seem to like my attempt to reorganize the files