Merge "Moved ContentHandler deriving classes into their own files for better discover...