Prep for CSS

Some restructuring and renaming of elements in preparation of styling
with CSS