Remove unnecessary files
Add helper functions for creating envelopes