reorder & update

reorder components into appropriate folders

update classes to match recently updated class names

js components
should have been added w/previous commit