More preliminary work on the proposal file; moved around some files