reorg files and added bfg