Dinodex oop

Refactored the code based on inputs and comments from Sophia.