Removed the rest of the bootstrap stuff and rearranged TS structures