Added folder and cleaned up csv names for organization purposes