Separate wrapper markup generator to its own module