Test for content directory

If a 'content' subdirectory exists, use that as the content directory. Otherwise use the base directory.