Changed some names and path