Support subdir and loading strategy

This superceeds #11