Fix: directory hierarchy