Reorganizing code in bootstrap.
Add and store types.