Split single-thread classes into a separate file