Renamed files to match class name. Split Classes into seperate files