Added bootstrap and fixed directories