Changed wrapper

Made several separate wrapper classes instead of one long wrapper that
encompassed the entire content.