Fix directory structure

This fixes the directory structure.