Reorganized folders, passing funcitons instead of if else
Reorganized folders