[PR] #20 fix - directory structure

Addresses #20