#107 Renamed files to match class names