Moving methods to utils and creating object classes for refactor.
The old files
?