re-arranging file names and wrapper class names
renamed files
fixed incorrect filename issues