refactor to reflect bootstrap structure; simplify; remove ET references

lots of changes. feel free to comment in line and i'll clean up before merging.
At the very least, we should preserve original author here. Adam got the ball rolling - want to make sure he's credited properly.