Updating structure preparing for 1.1
Fixed testing bootstrap