Reorganize files for consistency with my other repositories