Reorganized the data

- Added the submodule fxn/tkn
- Reorg'd the data