Quick file and settings reorg