Added bootstrap and reorganized