Initial stage of refactor

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

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

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