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.