Refactored code
Refactored fields
Moved renamer class
Refactored solution simulation