Moved bootstrap out of bootstrap folder