Refactored classes and added prediction and person into modules