Put low-level classes in separate files