Rearrange folder and add another fix-size object pool.