Start work on subdirectory support

Issue #12