Split into multiple file classes