Separate & remove common package