Organize classes into separate files