fixed and cleaned up packages