Restructure Data

- Restructuring the way the data is loaded. Means a small refresh of
how things are loaded.
- Data is broken
- Not all private methods updated
- Only public updated to match new style is Init