Moved receivers to separate package