Split stuff to reduce number of classes per file