Changed some things in the path and such

Not such exactly what was changed. Check the commit..