Fix package declarations by removing mux