New packages, code cleanup