Better Organize Classes