Restructured and made everything functional.

Signed-off-by: Daniel Connor <dconnor@catalystitservices.com>