Reshuffling of classes + methods (more logical)
Reshuffling of classes + methods (more logical)