Added bootstrap
Reorganized dependencies