Clean up - add package