Added more file separation by class