Condensed some small classes to one file.