can we wait with shuffling of pulp-related stuff into various dirs for now? Not sure yet how this is going to shape up...