Reorganizing core modules. Added bootstrap.