reorganization and addition of a few files rescued from dropbox