Rearranging Inputs

I rearranged the inputed variables to have better orginazion for the
user