davidm repackage and reorganize files