moving/renaming stuff cont'd
fixing build
Merge branch 'master' into docs