- Prevents some circular dependencies

- Allowed main to use them as needed
Signed-off-by: Sebastian Malton <sebastian@malton.name>