Rethinking the directory structure