Reworked compilation to use the same packaging model as the Gallery.