Update some paths and make it prettier