rework application info for different hosts
reorg code/files