Fix basic directory structure