Move classes / protocols into thier own files