capacity testing model and reorg
larger scale
changed naming convention