Cleaning up and adding base path.