Organize classes into own files