Refactor piggybacking and rename module to Partials