Moved class inclusions to a standalone file.