renamed files to match the name of classes