Fixes for subdirectory and comments in code examples