Updated declare's, reorg'ed locations of fns in files