Refactored base structure
Refactored some of the data
Rewritten few data files