Changed working directory, should be cleaner now