Reorganize files appropriately