Split up files with multiple classes to multiple files for autoload, sorry for baking this into this commit.
Mikael Nordfeldth