Moving files (again) - get rid of content directories
Got rid of content directories.  All tests pass