Issues/114/subdir objects

Fix #114.