initial setup
inital after rename
more rename cleanup
more rename cleanup
fixed everything after the move, verified demo works