Update package versions and refactor accordingly

This commit is contained in:
Oliver
2021-06-18 21:28:07 +10:00
parent a415a2cd99
commit 65cabc2fa9
12 changed files with 205 additions and 144 deletions