latest revisions to framework with john's changes to folder structure