Refactor reorg files (2/3)

Move files around.