Organize classes in better structure