Changed some paths and names