finished cleaning up the move from js/ to app/