Merge pull request #146 from unsecretised/app-refactor #34

Job	Run time
Test / Clippy (stable, windows-latest)	1m 42s
Format (rustfmt)	13s
Test / Clippy (stable, ubuntu-latest)	1m 8s
Test / Clippy (stable, macos-latest)	1m 7s
	4m 10s

Provide feedback