Fix installation directory structure