Restructured code

Signed-off-by: Brandyn White <bwhite@dappervision.com>