Reorganize a bit, and add file history