Move these to the main package - they will be needed for ANY distribution.