Changed package name and cleaned solution for final outputs