Remove bootstrap
New directories