Breaking out into better package structure