Refactor with Classes
Revert "Refactor with Classes"

This reverts commit dbcc703d995ffb157054f6980d05c93abfeb99a7.