Refactored the code base

Changed the getter setter system from JSON