Moving a few files around to better manage classes/modules

Signed-off-by: Yuri Tomanek <yuri@tomanek.com.au>
cleaning up

Signed-off-by: Yuri Tomanek <yuri@tomanek.com.au>