renamed files to match class names
fixed includes after rename

Should be good to go now.