clean up and split certain classes into own files