Refactor pacckages
Refactor OOP package
Refactor more OOP trail