Clean up packages, set geometry