Made some structural changes

Signed-off-by: Shawn Stringfield <shawn.stringfield@gmail.com>